From b96ec2e0b2d85ea567642ffd5174d8b9fd12f6d2 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 4 Feb 2002 06:08:28 +0000 Subject: [PATCH] rename "signal" arg to "name" to avoid compiler warnings about shadowing 2002-02-04 Havoc Pennington * gtk/gtksignal.c (gtk_signal_connect_while_alive): (gtk_signal_connect_object_while_alive): rename "signal" arg to "name" to avoid compiler warnings about shadowing signal(). #70453 --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtksignal.c | 8 ++++---- gtk/gtksignal.h | 4 ++-- 9 files changed, 55 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4613f1642f..b582bd3ec3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-02-04 Havoc Pennington + + * gtk/gtksignal.c (gtk_signal_connect_while_alive): + (gtk_signal_connect_object_while_alive): rename + "signal" arg to "name" to avoid compiler warnings + about shadowing signal(). #70453 + 2002-02-03 Anders Carlsson * gtk/gtkstyle.c (gtk_default_draw_expander): Add diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 4613f1642f..b582bd3ec3 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +2002-02-04 Havoc Pennington + + * gtk/gtksignal.c (gtk_signal_connect_while_alive): + (gtk_signal_connect_object_while_alive): rename + "signal" arg to "name" to avoid compiler warnings + about shadowing signal(). #70453 + 2002-02-03 Anders Carlsson * gtk/gtkstyle.c (gtk_default_draw_expander): Add diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4613f1642f..b582bd3ec3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2002-02-04 Havoc Pennington + + * gtk/gtksignal.c (gtk_signal_connect_while_alive): + (gtk_signal_connect_object_while_alive): rename + "signal" arg to "name" to avoid compiler warnings + about shadowing signal(). #70453 + 2002-02-03 Anders Carlsson * gtk/gtkstyle.c (gtk_default_draw_expander): Add diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4613f1642f..b582bd3ec3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2002-02-04 Havoc Pennington + + * gtk/gtksignal.c (gtk_signal_connect_while_alive): + (gtk_signal_connect_object_while_alive): rename + "signal" arg to "name" to avoid compiler warnings + about shadowing signal(). #70453 + 2002-02-03 Anders Carlsson * gtk/gtkstyle.c (gtk_default_draw_expander): Add diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4613f1642f..b582bd3ec3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2002-02-04 Havoc Pennington + + * gtk/gtksignal.c (gtk_signal_connect_while_alive): + (gtk_signal_connect_object_while_alive): rename + "signal" arg to "name" to avoid compiler warnings + about shadowing signal(). #70453 + 2002-02-03 Anders Carlsson * gtk/gtkstyle.c (gtk_default_draw_expander): Add diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4613f1642f..b582bd3ec3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2002-02-04 Havoc Pennington + + * gtk/gtksignal.c (gtk_signal_connect_while_alive): + (gtk_signal_connect_object_while_alive): rename + "signal" arg to "name" to avoid compiler warnings + about shadowing signal(). #70453 + 2002-02-03 Anders Carlsson * gtk/gtkstyle.c (gtk_default_draw_expander): Add diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4613f1642f..b582bd3ec3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2002-02-04 Havoc Pennington + + * gtk/gtksignal.c (gtk_signal_connect_while_alive): + (gtk_signal_connect_object_while_alive): rename + "signal" arg to "name" to avoid compiler warnings + about shadowing signal(). #70453 + 2002-02-03 Anders Carlsson * gtk/gtkstyle.c (gtk_default_draw_expander): Add diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c index 0729a064ea..380ad51e34 100644 --- a/gtk/gtksignal.c +++ b/gtk/gtksignal.c @@ -96,21 +96,21 @@ gtk_signal_emit_stop_by_name (GtkObject *object, void gtk_signal_connect_object_while_alive (GtkObject *object, - const gchar *signal, + const gchar *name, GtkSignalFunc func, GtkObject *alive_object) { g_return_if_fail (GTK_IS_OBJECT (object)); g_signal_connect_closure_by_id (object, - g_signal_lookup (signal, G_OBJECT_TYPE (object)), 0, + g_signal_lookup (name, G_OBJECT_TYPE (object)), 0, g_cclosure_new_object_swap (func, G_OBJECT (alive_object)), FALSE); } void gtk_signal_connect_while_alive (GtkObject *object, - const gchar *signal, + const gchar *name, GtkSignalFunc func, gpointer func_data, GtkObject *alive_object) @@ -122,7 +122,7 @@ gtk_signal_connect_while_alive (GtkObject *object, closure = g_cclosure_new (func, func_data, NULL); g_object_watch_closure (G_OBJECT (alive_object), closure); g_signal_connect_closure_by_id (object, - g_signal_lookup (signal, G_OBJECT_TYPE (object)), 0, + g_signal_lookup (name, G_OBJECT_TYPE (object)), 0, closure, FALSE); } diff --git a/gtk/gtksignal.h b/gtk/gtksignal.h index a9c2e34a23..cc4ab942d2 100644 --- a/gtk/gtksignal.h +++ b/gtk/gtksignal.h @@ -106,11 +106,11 @@ guint gtk_signal_new (const gchar *name, void gtk_signal_emit_stop_by_name (GtkObject *object, const gchar *name); void gtk_signal_connect_object_while_alive (GtkObject *object, - const gchar *signal, + const gchar *name, GtkSignalFunc func, GtkObject *alive_object); void gtk_signal_connect_while_alive (GtkObject *object, - const gchar *signal, + const gchar *name, GtkSignalFunc func, gpointer func_data, GtkObject *alive_object); -- 2.30.2